diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 4228906..f8a86ee 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,85 +1,105 @@
 #########
 Changelog
 #########
 
 This is the changelog for Puppetboard.
 
+0.0.5
+=====
+
+* Now requires WTForms versions less than 2.0
+* Adding a Flask development server in ``dev.py``.
+* Adding CSRF protection VIA the flask_wtf CsrfProtect object.
+* Allowing users to configure the report limit on pages where reports are
+  listed with the LIMIT_REPORTS configuration option.
+* Adding an inventory page to users to be able to see all available nodes
+  and a configure lists of facts to display VIA the INVENTORY_FACTS
+  configuration option.
+* Adding a page to view a node's catalog information if enabled, disabled
+  by default. Can be changed with the ENABLE_CATALOG configuration attribute.
+* New configuration option GRAPH_FACTS allows the user to choose which graphs
+  will generate pie on the fact pages.
+* Replacing Chart.js with c3.js and d3.js.
+* Adding Semantic UI 0.16.1 and removing unused bootstrap styles.
+* Adding an OFFLINE_MODE configuration option to load local assets or from a
+  CDN service. This is useful in environments without internet access.
+
 0.0.4
 =====
 
 * Fix the sorting of the different tables containing facts.
 * Fix the license in our ``setup.py``. The license shouldn't be longer than
   200 characters. We were including the full license tripping up tools like
   bdist_rpm.
 
 0.0.3
 =====
 This release introduces a few big changes. The most obvious one is the
 revamped Overview page which has received significant love. Most of the work
 was done by Julius Härtl. The Nodes tab has been given a slight face-lift
 too.
 
 Other changes:
 
 * This release depends on the new pypuppetdb 0.1.0. Because of this the SSL
   configuration options have been changed:
 
   * ``PUPPETDB_SSL`` is gone and replaced by ``PUPPETDB_SSL_VERIFY`` which
     now defaults to ``True``. This only affects connections to PuppetDB that
     happen over SSL.
   * SSL is automatically enabled if both ``PUPPETDB_CERT`` and
     ``PUPPETDB_KEY`` are provided.
 
 * Display of deeply nested metrics and query results have been fixed.
 * Average resources per node metric is now displayed as a natural number.
 * A link back to the node has been added to the reports.
 * A few issues with reports have been fixed.
 * A new setting called ``UNRESPONSIVE_HOURS`` has been added which denotes
   the amount of hours after which Puppetboard will display the node as
   unreported if it hasn't checked in. We default to ``2`` hours.
 * The event message can now be viewed by clicking on the event.
 
 Puppetboard is now neatly packaged up and available on PyPi. This should
 significantly help reduce the convoluted installation instructions people had
 to follow.
 
 Updated installation instructions have been added on how to install from PyPi
 and how to configure your HTTPD.
 
 0.0.2
 =====
 In this release we've introduced a few new things. First of all we now require
 pypuppetdb version 0.0.4 or later which includes support for the v3 API
 introduced with PuppetDB 1.5.
 
 Because of changes in PuppetDB 1.5 and therefor in pypuppetdb users of the v2
 API, regardless of the PuppetDB version, will no longer be able to view reports
 or events.
 
 In light of this the following settings have been removed:
 
 * ``PUPPETDB_EXPERIMENTAL``
 
 Two new settings have been added:
 
 * ``PUPPETDB_API``: an integer, defaulting to ``3``, representing the API
   version we want to use.
 * ``ENABLE_QUERY``: a boolean, defaulting to ``True``, on wether or not to
   be able to use the Query tab.
 
 We've also added a few new features:
 
 * Thanks to some work done during PuppetConf together with Nick Lewis (from
   Puppet Labs) we now expose all of PuppetDB's metrics in the Metrics tab. The
   formatting isn't exactly pretty but it's a start.
 * Spencer Krum added the graphing capabilities to the Facts tab.
 * Daniel Lawrence added a feature so that facts on the node view are clickable
   and take you to the complete overview of that fact for your infrastructure
   and made the nodes in the complete facts list clickable so you can jump to a
   node.
 * Klavs Klavsen contributed some documentation on how to run Puppetboard with
   Passenger.
 
 0.0.1
 =====
 Initial release.
diff --git a/puppetboard/templates/layout.html b/puppetboard/templates/layout.html
index 910bab3..f60c8de 100644
--- a/puppetboard/templates/layout.html
+++ b/puppetboard/templates/layout.html
@@ -1,86 +1,86 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Puppetboard</title>
     {% if config.OFFLINE_MODE %}
     <link href="{{ url_for('static', filename='css/semantic.min.css') }}" rel="stylesheet">
     <style>
       @font-face {
         font-family: 'Open Sans';
         font-style: normal;
         font-weight: 400;
         src: local('Open Sans'), local('OpenSans'), url({{ url_for('static', filename='fonts/Open_Sans.woff') }}) format('woff');
       }
     </style>
     <link href="{{ url_for('static', filename='css/jquery.tablesorter.filter.formatter.css') }}" rel="stylesheet">
     {% else %}
     <link href="//cdnjs.cloudflare.com/ajax/libs/semantic-ui/0.16.1/css/semantic.min.css" rel="stylesheet">
     <link href='//fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
     <link href="//cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.17.2/css/filter.formatter.css" rel="stylesheet">
     {% endif %}
     <link href="{{ url_for('static', filename='css/puppetboard.css') }}" rel="stylesheet">
   </head>
 
   <body>
     <nav class="ui fixed darkblue inverted menu">
       <div class="title item">
         Puppetboard
       </div>
       {%- for endpoint, caption in [
       ('index', 'Overview'),
       ('nodes', 'Nodes'),
       ('facts', 'Facts'),
       ('reports', 'Reports'),
       ('metrics', 'Metrics'),
       ('inventory', 'Inventory'),
       ('query', 'Query'),
       ] %}
       <a {% if endpoint == request.endpoint %} class="active item" {% else %} class="item" {% endif %}
         href="{{ url_for(endpoint) }}">{{ caption }}</a>
       {%- endfor %}
-      <div class="item" style="float:right"><a href="https://github.com/puppet-community/puppetboard" target="_blank">v0.0.4</a></div>
+      <div class="item" style="float:right"><a href="https://github.com/puppet-community/puppetboard" target="_blank">v0.0.5</a></div>
     </nav>
     <div class="ui grid padding-bottom">
       <div class="one wide column"></div>
       <div class="fourteen wide column">
         {% block content %} {% endblock content %}
       </div>
       <div class="one wide column"></div>
     </div>
 
     <div id="scroll-btn-top">
       <i class="large arrow up icon"></i>
     </div>
 
     <footer class="ui absolute fixed bottom">
       <div>
 	Copyright &copy; 2013-{{ now('%Y') }} <a href="https://github.com/daenney" target="_blank">Daniele Sluijters</a>. <span style="float:right">Live from PuppetDB.</span>
       </div>
     </footer>
 
     {% if config.OFFLINE_MODE %}
     <script src="{{ url_for('static', filename='js/jquery.min.js') }}"></script>
     <script src="{{ url_for('static', filename='js/semantic.min.js') }}"></script>
     {% if config.LOCALISE_TIMESTAMP %}
       <script src="{{ url_for('static', filename='js/moment.min.js') }}"></script>
     {% endif %}
     <script src="{{ url_for('static', filename='js/jquery.tablesorter.min.js') }}"></script>
     {% else %}
     <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/semantic-ui/0.16.1/javascript/semantic.min.js"></script>
     {% if config.LOCALISE_TIMESTAMP %}
       <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.7.0/moment.min.js"></script>
     {% endif %}
     <script src="//cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.17.2/jquery.tablesorter.min.js"></script>
     {% endif %}
     {% if config.LOCALISE_TIMESTAMP %}
       <script src="{{ url_for('static', filename='js/timestamps.js')}}"></script>
     {% endif %}
     <script src="{{ url_for('static', filename='js/lists.js') }}"></script>
     <script src="{{ url_for('static', filename='js/tables.js') }}"></script>
     <script src="{{ url_for('static', filename='js/scroll.top.js') }}"></script>
 
     {% block script %} {% endblock script %}
   </body>
 </html>
diff --git a/setup.py b/setup.py
index a0c4775..fbd9aef 100644
--- a/setup.py
+++ b/setup.py
@@ -1,53 +1,53 @@
 import sys
 import os
 import codecs
 
 from setuptools import setup, find_packages
 
 
 if sys.argv[-1] == 'publish':
     os.system('python setup.py sdist upload')
     sys.exit()
 
-VERSION = "0.0.4"
+VERSION = "0.0.5"
 
 with codecs.open('README.rst', encoding='utf-8') as f:
     README = f.read()
 
 with codecs.open('CHANGELOG.rst', encoding='utf-8') as f:
     CHANGELOG = f.read()
 
 setup(
     name='puppetboard',
     version=VERSION,
     author='Daniele Sluijters',
     author_email='daniele.sluijters+pypi@gmail.com',
     packages=find_packages(),
     url='https://github.com/nedap/puppetboard',
     license='Apache License 2.0',
     description='Web frontend for PuppetDB',
     include_package_data=True,
     long_description='\n'.join((README, CHANGELOG)),
     install_requires=[
         "Flask >= 0.10.1",
         "Flask-WTF >= 0.9.4, <= 0.9.5",
         "WTForms < 2.0",
-        "pypuppetdb >= 0.1.0",
+        "pypuppetdb < 0.2.0",
         ],
     keywords="puppet puppetdb puppetboard",
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Environment :: Web Environment',
         'Framework :: Flask',
         'Intended Audience :: System Administrators',
         'Natural Language :: English',
         'License :: OSI Approved :: Apache Software License',
         'Operating System :: POSIX',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         ],
 )